split-evoab

Gbp-Pq: Name split-evoab.diff

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b1472512c09e525f6afdda3107b79c3ea54412e8..37b4fcc220bf60a3aacc00e32abc9c7b3f4bbf2a 100644 (file)
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -335,8 +335,9 @@ ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+postprocess_XCDS += evoab.xcd
+postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 postprocess_DRIVERS += evoab
 endif
 ifeq ($(ENABLE_JAVA),TRUE)

diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 3e2fa774d9d8c420134d918272564ad8d71bf3e6..4cb72356ce11069004b75736ccfbe134936ecb7b 100644 (file)
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
        ENABLE_GIO \
        ENABLE_GNOMEVFS \
        ENABLE_LOCKDOWN \
+        ENABLE_EVOAB2 \
         ENABLE_GTK \
 ))
 

diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index c7a13c83dc9d659012a22a11e971ea2e188305ca..a3f59a6f63cbced7232eabd48e9c6ae0aab2c371 100644 (file)
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -25,3 +25,13 @@ File gid_File_Share_Registry_Gnome_Xcd
     Name = "gnome.xcd";
 End
 #endif
+
+#ifdef ENABLE_EVOAB2
+File gid_File_Share_Registry_Evoab_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "evoab.xcd";
+End
+#endif
+

diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index c1244415f3c5be295593b1c640cef6afc21d7e54..0a15b9aa9415070f6b2e177d4d88bb9ee795caa2 100644 (file)
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -32,6 +32,9 @@ Module gid_Module_Optional_Gnome
     Files = (auto_gnome_ALL,
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
       gid_File_Share_Registry_Gnome_Xcd,
+#endif
+#ifdef ENABLE_EVOAB2
+     gid_File_Share_Registry_Evoab_Xcd,
 #endif
       gid_File_Bin_Gnome_Open_Url,
       gid_File_Bin_Gnome_Open_Url_Bin,